Unwrap script validity field in TxBodyContent #3091
Conversation
newhoggy
requested review from
DavidEichmann,
dcoutts,
deepfire,
denisshevchenko,
erikd,
Jimbo4350,
jutaro and
MarcFontaine
as code owners
There was a problem hiding this comment.
Good so far, but we have to plumb the flag through to the right place so we can properly have the flag value go back and forth with the underlying ledger tx type (which does contain the flag).
type instance Core.Tx (AlonzoEra c) = ValidatedTx (AlonzoEra c)
data ValidatedTx era = ValidatedTx
{ body :: !(Core.TxBody era),
wits :: !(TxWitness era),
isValidating :: !IsValidating,
auxiliaryData :: !(StrictMaybe (Core.AuxiliaryData era))
}
So as you see, the flag value is directly available.
| pattern TxBody txbodycontent <- (getTxBodyContent TxScriptValidityNone -> txbodycontent) | ||
| {-# COMPLETE TxBody #-} | ||
|
|
||
| getTxBodyContent :: TxBody era -> TxBodyContent ViewTx era | ||
| getTxBodyContent (ByronTxBody body) = getByronTxBodyContent body | ||
| getTxBodyContent (ShelleyTxBody era body _scripts _redeemers mAux _scriptValidity) = | ||
| fromLedgerTxBody era body mAux | ||
| getTxBodyContent :: TxScriptValidity era -> TxBody era -> TxBodyContent ViewTx era | ||
| getTxBodyContent _ (ByronTxBody body) = getByronTxBodyContent body | ||
| getTxBodyContent scriptValidity (ShelleyTxBody era body _scripts _redeemers mAux _scriptValidity) = | ||
| fromLedgerTxBody era scriptValidity body mAux |
There was a problem hiding this comment.
No we would have to add the validity flag into the TxBody type, probably as an extra field in the ShelleyTxBody constructor. We have to get the value from the underlying ledger tx type, and not invent it. For one thing we need to do that to have the TxBody round trip test pass, but more importantly we need it to get the right value for the tx from a block.
There was a problem hiding this comment.
See also getAlonzoTxBody where we extract the parts of the Alonzo.ValidatedTx.
There was a problem hiding this comment.
I remove the argument of getTxBodyContent and am taking it from TxBody.
newhoggy
force-pushed
the
unwrap-script-validity-in-tx-body-content
branch
2 times, most recently
from
231f435
to
95e5452
Compare
|
bors merge |
newhoggy
force-pushed
the
unwrap-script-validity-in-tx-body-content
branch
from
95e5452
to
528a573
Compare
|
Canceled. |
newhoggy
force-pushed
the
unwrap-script-validity-in-tx-body-content
branch
2 times, most recently
from
e5efa5a
to
31e6c75
Compare
newhoggy
force-pushed
the
unwrap-script-validity-in-tx-body-content
branch
from
31e6c75
to
80cf2f1
Compare
|
bors merge |
|
Build failed: |
newhoggy
force-pushed
the
unwrap-script-validity-in-tx-body-content
branch
from
80cf2f1
to
45ce7fd
Compare
|
bors r+ |
|
Build failed: |
|
bors r+ |
|
Build succeeded: |
No description provided.